Index: webapp/catalog/find/keywordsearchbox.ftl =================================================================== --- webapp/catalog/find/keywordsearchbox.ftl (revision 677028) +++ webapp/catalog/find/keywordsearchbox.ftl (working copy) @@ -31,86 +31,64 @@ //--> -
-
-
- <#if isOpen> -  _  - <#else> -  []  - -
-
${uiLabelMap.ProductSearchProducts}
-
-<#if isOpen> -
-
-
- ${uiLabelMap.ProductKeywords}: - - ${uiLabelMap.ProductCategoryId}: - - Click here For Field Lookup - - ${uiLabelMap.CommonNoContains} - - checked="checked"/> - - ${uiLabelMap.CommonAny} - - checked="checked"/> - - ${uiLabelMap.CommonAll} - - checked="checked"/> -   - ${uiLabelMap.CommonFind} -
-
-
-
- - ${uiLabelMap.ProductCategoryId}: - - Click here For Field Lookup -
- ${uiLabelMap.ProductAdvancedSearch} -
-
-
-
-
- - Click here For Field Lookup - -
-
-
- -
+
+ ${uiLabelMap.ProductKeywords}: + + ${uiLabelMap.ProductCategoryId}: + + Click here For Field Lookup + + ${uiLabelMap.CommonNoContains} + + checked="checked"/> + + ${uiLabelMap.CommonAny} + + checked="checked"/> + + ${uiLabelMap.CommonAll} + + checked="checked"/> +   + ${uiLabelMap.CommonFind} +
+
+ + ${uiLabelMap.ProductCategoryId}: + + Click here For Field Lookup +
+ ${uiLabelMap.ProductAdvancedSearch} +
+
+
+ + Click here For Field Lookup + +
Index: webapp/catalog/find/miniproductlist.ftl =================================================================== --- webapp/catalog/find/miniproductlist.ftl (revision 677028) +++ webapp/catalog/find/miniproductlist.ftl (working copy) @@ -17,43 +17,27 @@ under the License. --> -
-
-
- <#if isOpen> -  _  - <#else> -  []  - -
-
${uiLabelMap.ProductCategoryProducts}
-
-<#if isOpen> -
- <#if productCategory?exists> - <#if productCategoryMembers?has_content> - <#list productCategoryMembers as productCategoryMember> - <#assign product = productCategoryMember.getRelatedOneCache("Product")> -
- - ${product.internalName?default("${uiLabelMap.CommonNo} ${uiLabelMap.ProductInternalName}")} - -
- ${product.productId} -
-
- - <#if (listSize > viewSize)> -
-
NOTE: Only showing the first ${viewSize} of ${listSize} products. To view the rest, use the Products tab for this category.
-
- - <#else> -
${uiLabelMap.ProductNoProductsInCategory}.
- - <#else> -
${uiLabelMap.ProductNoCategorySpecified}.
- -
+<#if productCategory?exists> + <#if productCategoryMembers?has_content> + <#list productCategoryMembers as productCategoryMember> + <#assign product = productCategoryMember.getRelatedOneCache("Product")> +
+ + ${product.internalName?default("${uiLabelMap.CommonNo} ${uiLabelMap.ProductInternalName}")} + +
+ ${product.productId} +
+
+ + <#if (listSize > viewSize)> +
+
NOTE: Only showing the first ${viewSize} of ${listSize} products. To view the rest, use the Products tab for this category.
+
+ + <#else> +
${uiLabelMap.ProductNoProductsInCategory}.
+ +<#else> +
${uiLabelMap.ProductNoCategorySpecified}.
-
Index: webapp/catalog/find/sidecatalogs.ftl =================================================================== --- webapp/catalog/find/sidecatalogs.ftl (revision 677028) +++ webapp/catalog/find/sidecatalogs.ftl (working copy) @@ -16,37 +16,21 @@ specific language governing permissions and limitations under the License. --> -
-
-
- <#if isOpen> -  _  - <#else> -  []  - -
-
${uiLabelMap.ProductBrowseCatalogs}
-
-<#if isOpen> -
-
${uiLabelMap.ProductCatalogDetailList}
-
- <#assign sortList = Static["org.ofbiz.base.util.UtilMisc"].toList("prodCatalogCategoryTypeId", "sequenceNum", "productCategoryId")> - <#list prodCatalogs as prodCatalog> - <#if curProdCatalogId?exists && curProdCatalogId == prodCatalog.prodCatalogId> - <#assign prodCatalogCategories = prodCatalog.getRelatedOrderByCache("ProdCatalogCategory", sortList)> -
- ${prodCatalog.catalogName?if_exists}
-
- <#list prodCatalogCategories as prodCatalogCategory> - <#assign productCategory = prodCatalogCategory.getRelatedOneCache("ProductCategory")> -
- ${(productCategory.categoryName)?default(productCategory.description)?default(productCategory.productCategoryId)}
- -
- <#else> -
- ${prodCatalog.catalogName?if_exists}
- - -
-
- +
${uiLabelMap.ProductCatalogDetailList}
+
+ <#assign sortList = Static["org.ofbiz.base.util.UtilMisc"].toList("prodCatalogCategoryTypeId", "sequenceNum", "productCategoryId")> + <#list prodCatalogs as prodCatalog> + <#if curProdCatalogId?exists && curProdCatalogId == prodCatalog.prodCatalogId> + <#assign prodCatalogCategories = prodCatalog.getRelatedOrderByCache("ProdCatalogCategory", sortList)> +
- ${prodCatalog.catalogName?if_exists}
+
+ <#list prodCatalogCategories as prodCatalogCategory> + <#assign productCategory = prodCatalogCategory.getRelatedOneCache("ProductCategory")> +
- ${(productCategory.categoryName)?default(productCategory.description)?default(productCategory.productCategoryId)}
+ +
+ <#else> +
- ${prodCatalog.catalogName?if_exists}
+ +
Index: webapp/catalog/find/sidedeepcategory.ftl =================================================================== --- webapp/catalog/find/sidedeepcategory.ftl (revision 677028) +++ webapp/catalog/find/sidedeepcategory.ftl (working copy) @@ -56,36 +56,20 @@ -
-
-
- <#if isOpen> -  _  - <#else> -  []  - -
-
${uiLabelMap.ProductBrowseCategories}
-
-<#if isOpen> -
-
${uiLabelMap.ProductChooseTopCategory}
-
- <#if currentTopCategory?exists> - <#if curCategoryId?exists && curCategoryId == currentTopCategory.productCategoryId> -
- ${currentTopCategory.categoryName?default("No Name")} [${currentTopCategory.productCategoryId}]
- <#else> -
- ${currentTopCategory.categoryName?default(currentTopCategory.description)?if_exists} [${currentTopCategory.productCategoryId}]
- - -
- <#if topLevelList?exists> - <#list topLevelList as category> - <@categoryList parentCategory=category category=category/> - - -
-
-
+
${uiLabelMap.ProductChooseTopCategory}
+
+<#if currentTopCategory?exists> + <#if curCategoryId?exists && curCategoryId == currentTopCategory.productCategoryId> +
- ${currentTopCategory.categoryName?default("No Name")} [${currentTopCategory.productCategoryId}]
+ <#else> +
- ${currentTopCategory.categoryName?default(currentTopCategory.description)?if_exists} [${currentTopCategory.productCategoryId}]
+ +
+ <#if topLevelList?exists> + <#list topLevelList as category> + <@categoryList parentCategory=category category=category/> + + +
Index: webapp/catalog/includes/appheader.ftl =================================================================== --- webapp/catalog/includes/appheader.ftl (revision 677028) +++ webapp/catalog/includes/appheader.ftl (working copy) @@ -1,42 +0,0 @@ -<#-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at - -http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, either express or implied. See the License for the -specific language governing permissions and limitations -under the License. ---> - -<#assign selected = headerItem?default("void")> - -
-

${uiLabelMap.ProductCatalogManagerApplication}

- -
-
Index: webapp/catalog/includes/appheader.ftl =================================================================== --- webapp/catalog/includes/appheader.ftl (revision 677028) +++ webapp/catalog/includes/appheader.ftl (working copy) @@ -1,42 +0,0 @@ -<#-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at - -http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, either express or implied. See the License for the -specific language governing permissions and limitations -under the License. ---> - -<#assign selected = headerItem?default("void")> - -
-

${uiLabelMap.ProductCatalogManagerApplication}

- -
-
Index: webapp/catalog/WEB-INF/web.xml =================================================================== --- webapp/catalog/WEB-INF/web.xml (revision 677028) +++ webapp/catalog/WEB-INF/web.xml (working copy) @@ -41,7 +41,7 @@ mainDecoratorLocation - component://product/widget/catalog/CatalogCommonScreens.xml + component://product/widget/catalog/CommonScreens.xml The location of the main-decorator screen to use for this webapp; referred to as a context variable in screen def XML files. Index: widget/catalog/CatalogCommonScreens.xml =================================================================== --- widget/catalog/CatalogCommonScreens.xml (revision 677028) +++ widget/catalog/CatalogCommonScreens.xml (working copy) @@ -1,339 +0,0 @@ - - - - - -
- - - - - - - - - - - - - - - - - - - - - - -
- - - -
- - - - - - - - - - - - - -
- - - - - -
- - - - - - - - - - - - - - - - - - -
- - - - - - -
- - - -
- - - -
- - - - - - - - -
- - - - - - - - - - - - - - - - - - -
- - - -
- - - -
- - - - - - - - -
- - - - - -
- - - - - - - - - - - - - -
- - - - - - - -
- - - -
- - - -
- - - - - - - - -
- - - - - - - - - - - - - - - - - -
- - - -
- - - -
- - - - - - - - -
- - -
- - - - - -